Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Jul 2010 22:49:04 +0000 (22:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Jul 2010 22:49:04 +0000 (22:49 +0000)
commit82bdfcd6ee50b78a15339080f2fa460e044b72d4
tree096a11385fa5142af52d2ba4492d5c3bd4acbece
parent94e24730ee96d2e329946572c15061f8a0e79cbb
parentd3b82a42c6b9a7ccf324fcc3244e9c9da27384dd
Merge from mainline.